Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 27 Jan 2011 06:21:24 +0000 (22:21 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 27 Jan 2011 06:21:24 +0000 (22:21 -0800)
commit738ffdda51eda183caa35387d1f505feb6231c72
tree6d80a1f25dc9e07a4e4a6e67d1da4d19207875bd
parent51266f0bd922c9f22af6cbbd5ac5eb159caeda96
parente4c9ce8d1bd9aee52f4be047b322d935401ffa83
Merge from mainline.